Merge remote-tracking branch 'origin/master' into feature/pgtk

author Po Lu <luangruo@yahoo.com>

Mon, 6 Dec 2021 00:57:17 +0000 (08:57 +0800)

committer Po Lu <luangruo@yahoo.com>

Mon, 6 Dec 2021 00:57:17 +0000 (08:57 +0800)
author Po Lu <luangruo@yahoo.com>
Mon, 6 Dec 2021 00:57:17 +0000 (08:57 +0800)
committer Po Lu <luangruo@yahoo.com>
Mon, 6 Dec 2021 00:57:17 +0000 (08:57 +0800)
diff --cc doc/lispref/frames.texi
Simple merge
diff --cc lisp/frame.el
Simple merge
diff --cc lisp/startup.el
Simple merge
diff --cc src/image.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Mon, 6 Dec 2021 00:57:17 +0000 (08:57 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Mon, 6 Dec 2021 00:57:17 +0000 (08:57 +0800)
		1	2
doc/lispref/frames.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/frame.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/image.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history